Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:23:03 +0000 (21:23 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:23:03 +0000 (21:23 +0200)

Trivial merge